Merge "Snap for 4794708 from 01814056abd52eb9a39023eefe2799b49ea1b393 to sdk-release" into sdk-release