Snap for 8564071 from 248d7c742809ce1cbde1c4e6163d347e1feb274b to mainline-extservices-release

Change-Id: Ia34835a2e91367b3b9279af830ba4771c65a8f88