Merge "Snap for 8952093 from 4f7d38b549e32db02329f61b1eaf5b7798c4f14a to sdk-release" into sdk-release