Snap for 12574852 from 7e7449ce8e79a0b992689218c57f7cdf42513744 to sdk-release

Change-Id: I3d0527717aa2110d1c61dd9a2dd09e53541ec934