Merge "Snap for 11754915 from 90ebde7475e4c4c5767836e80810f64db499041c to sdk-release" into sdk-release