Merge "Snap for 5735642 from d1229371473a5c9522aeef52b8d9faeb5767de5a to sdk-release" into sdk-release