Snap for 8564071 from b6c4ab13d63f799b51fcc22cc9423e8440d99eea to mainline-extservices-release

Change-Id: I170fc3f5c161952176876cb5f1fa66d8e7633d04