Merge "Snap for 11724015 from 455dcbf51369c9192c9b6fa83c78b09989eea805 to sdk-release" into sdk-release