Merge "Snap for 13198286 from 38e4d4533220e6e18d314dfb1d777b34c4d45797 to sdk-release" into sdk-release