Merge "Snap for 13270875 from ec60596b922b7d588eadfd4687da1c20b68f1b20 to sdk-release" into sdk-release