Merge "Snap for 11566117 from 97868a1befe9369d3d93475b97a473c6bb44eff3 to sdk-release" into sdk-release