Merge "Snap for 5925869 from bf7fd5c8280bf69dbd1b14abad9373e4dd04391f to sdk-release" into sdk-release