Merge "Snap for 5798008 from 9b49d23b8165404d5d97554b05c0d96a66d6566f to sdk-release" into sdk-release