Snap for 8023979 from eb43f1bcc82594612a2885280d60e96bcea6aa5d to sdk-release

Change-Id: Icb91467a3f50660c156d8230b1ae25defdd5d2cc