Merge "Snap for 11566117 from 83b466fb11f6fbe103adbc2e490e9e4cceed2859 to sdk-release" into sdk-release