Snap for 12610195 from 1d197271d9ac137a1cb2fe70d854eecd82353b64 to sdk-release

Change-Id: I6465854edaff9e40fac283d2345db69c36766594