Snap for 8564071 from 3b9beac059a2a187dbb538dace479aa6e770a844 to mainline-extservices-release

Change-Id: Iccc1839915b90bfcbab593f916f431edc8472af9