Merge "Snap for 6877830 from 0f9cd82e15da165dd6b65a85ccd5b722dc9374e0 to sdk-release" into sdk-release