Merge "Snap for 10929834 from 5c387116e235ff706ba0baf63a9883b72c872490 to sdk-release" into sdk-release