Merge "Snap for 5590969 from e066f91c0f540c09bd1b859bb4d4e31c505d0645 to sdk-release" into sdk-release