Snap for 10453563 from bee1c61bcc963e883cbdae3badcf874bbd36d2d8 to mainline-extservices-release

Change-Id: I138fe0bb36b06e361c08b5967912e523857ac53d