Snap for 8782634 from 0c12430a857084fae134f303f153cfa2a97bfb89 to sdk-release

Change-Id: I5c763f6a5b031cd96e959f13f4866d338f1c41be