Merge "Snap for 6198741 from 57495556bcda388adb8d1fbd198035efa62aaba1 to sdk-release" into sdk-release