Merge "Snap for 11598262 from 488a2af021e3e7473f083a9435b1472c0d411f3d to sdk-release" into sdk-release