Merge "Snap for 11541002 from 4e0d2475a5cdd6d5d3fb8f95a01055098383f18a to sdk-release" into sdk-release