Merge "Snap for 11754915 from 2978c0da22cc534ab3e319a650d5829eb290b9bd to sdk-release" into sdk-release