Merge "Snap for 13198286 from 4878f94db47c97ca58642edc18e1a5628f242e87 to sdk-release" into sdk-release