Merge "Snap for 5925869 from 69627e52b9cd071bc07e490f77ae9860b452cd9c to sdk-release" into sdk-release