Merge "Snap for 11692525 from c532cd4dd8616205a8192efeb8e09c796c4418b5 to sdk-release" into sdk-release