Merge "Snap for 6198741 from deaedfdb8ca26ec22231727e076ae2cf4e4e944a to sdk-release" into sdk-release