-03 to host and target

Change-Id: I6f811caabd9bb81b21738033a3d86b45445efcf0