Merge "Snap for 9570125 from bff6b3b9791b0d3467de088d8fa03cc24d87af16 to sdk-release" into sdk-release