Snap for 12349386 from 921a16caf5ce6d6e3ef68af5d7c3cff4b88a7965 to sdk-release

Change-Id: I1214b2005fd9b1e8d9f7d1492e5a052e26232186