Snap for 9679998 from b917540b3d2706a8831d7656fbc602b5237df879 to sdk-release

Change-Id: I0412ab926255d78a9e5ee7f8e41799015bce0ace