Merge "Snap for 11598262 from 9e394fc1191aa2c0c82b9a6e66db6a30881500a5 to sdk-release" into sdk-release