Snap for 7183507 from 219f5218dd953569c6744dce1edab13599fa9ad8 to sdk-release

Change-Id: I9c00ed49a086b4086925fb94c93cd166f28e0a18