Snap for 10453563 from 7aa878004d2c1554a2bfe337c06a351d9dfd5742 to mainline-extservices-release

Change-Id: Ibe10c3198414aaf27f6577a8cca5472b5f8ae14b