aml_ext_331012020
Snap for 8916866 from a44e7353f94cf4e68f4f8c89634faaf9a4874d06 to mainline-extservices-release

Change-Id: Ie59265e736f8675bc4aa4820185a87bfb0616f49