Snap for 7183507 from 1bb70c01a01d874502a3cdb16e73302b83c7a99e to sdk-release

Change-Id: I44e5bd171ed0d5591ff923d84e615bcd612e2ae3