Snap for 7478067 from 03d6848612fcfd89e2a29be29804072a7881dc77 to mainline-extservices-release

Change-Id: Ia69fc64b76ed4d4477736b5536be29904aabdb88