Merge "Snap for 5590969 from 7ccec7cf8dcbbfde9fcc92e29729c73a561838bf to sdk-release" into sdk-release