Merge "Snap for 11699450 from 5ad47d4cb96a3712ad6bbe409014579ef2b85311 to sdk-release" into sdk-release