Merge "Snap for 5925869 from a51c32c7d16d32462fcd2d3fc61474bb0ec56864 to sdk-release" into sdk-release