Merge "Snap for 8554636 from 4399e8f9ea319217ba19d50ac23431d9a54e3f51 to sdk-release" into sdk-release