Merge "Snap for 12779445 from dfcea4b6de9d2c250461a2f51f500b8cc28023a4 to sdk-release" into sdk-release