Merge "Snap for 11541002 from e1e7a35af3cd7d530343c0a2c0bc1ce40edd6508 to sdk-release" into sdk-release