Merge "Snap for 7110675 from 57812e63b59d2b1e314538c9947be60736d8e86f to sdk-release" into sdk-release