Snap for 7183507 from 5ac8e0d666f255c8a56f21cbeb8cd14b8348552f to sdk-release

Change-Id: I82b7f3c88cd3b82d7a51b3d13eb02fa041dd8ca9