Merge "Snap for 9679998 from b917540b3d2706a8831d7656fbc602b5237df879 to sdk-release" into sdk-release