Merge "Snap for 9679998 from de8e328e5ab0291b198446486f7e873767d5e35e to sdk-release" into sdk-release