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