Merge "Snap for 6198741 from f2a15e8742cf33e37e6c96f4731c298c6749bb68 to sdk-release" into sdk-release