Merge "Snap for 5735642 from 97c06703f6cd899d62b83ba8c7d2b226ad12da95 to sdk-release" into sdk-release