Merge "Snap for 7487883 from 0c976e03e011ce0bc8dcfe10aad1b3d046f4d9e5 to sdk-release" into sdk-release