Snap for 11174750 from d8499989c8c1826adcb6374d4450d69d3d2b9edc to mainline-extservices-release

Change-Id: Ia5eee980e35327cfd708a9ac7d08a9a3304b93c7