Merge "Snap for 11692525 from 9ecd5a2566ba9b2aaec7678e26f80fd38706122e to sdk-release" into sdk-release