Merge "Snap for 13198286 from b9e99b1734b89463016d99c65785cff0064eb814 to sdk-release" into sdk-release