Merge "Snap for 11598262 from 6cc454b6e9367825dfc9d3f230a6bb5337b1cb3b to sdk-release" into sdk-release