Merge "Snap for 7550740 from 308a76e1996a1c72cc0bd708acb217dad4323e35 to sdk-release" into sdk-release