Merge "Snap for 7715168 from 4fd0ff97569e2fdaef1eefde0802ebda616bfada to sdk-release" into sdk-release