Snap for 10453563 from 06387f8b991242b15b54a46445407306b5e34764 to mainline-extservices-release

Change-Id: I523ab24a8bbd03966fe3d3103a369abe626c30d4