Snap for 11174750 from 3414d01c7f3606bd700a9bff22df47d6d53c8b6a to mainline-extservices-release

Change-Id: Idb290b4359718b7913c63835c234b0868456a627