Merge "Snap for 5590969 from 5bf30757a9123571478050e5b471e5d0e3e0a095 to sdk-release" into sdk-release