Merge "Snap for 11605179 from 749ad855ed8f99d87078218d8ec04225eda60d9b to sdk-release" into sdk-release