Snap for 12349386 from d8e2cfaf8d48b71bb64bc78907b6d4105bcbf26e to sdk-release

Change-Id: I1eb5d2a1e7601be6e4885e873482bdbe73614ade