Snap for 8582999 from fa553d18864e482cbdb0579d266ba5efca79ad7a to mainline-extservices-release

Change-Id: Ifb27439e197ca59f9e929c74e2d9a130241ca311