Snap for 8564071 from 9809c901b8737f6d3e2a91fadf77fdf445620553 to mainline-extservices-release

Change-Id: I095ce0214d3205950de266c95ca77cb61c69abcd