Merge "Snap for 5949240 from 91c830842b69890d0e52637cca9f04ea24557802 to sdk-release" into sdk-release