Merge "Snap for 9550355 from 053404e7568465cd1bd1d89e4289908f56f4a379 to sdk-release" into sdk-release