Snap for 7132927 from e9af524b6a6bc0af23ac834738a309be979442ac to mainline-extservices-release

Change-Id: Ibdcef1afd5fe6af9672f3593d0268edcbf4ab4e8