Merge "Snap for 13278158 from 38878b88206dbc25342587258cbe8723b3c19d50 to sdk-release" into sdk-release