Merge "Snap for 10929834 from 8e9a212552c9096cfeccaacd65dea1d1bca88107 to sdk-release" into sdk-release