Merge "Snap for 6405781 from c7e949b743fc1bc50dbaa0be22d893d57c34bdf1 to sdk-release" into sdk-release