Merge "Remove unused using statement / host stub" am: 86dade8f6f am: 841e457494
am: ec737fbca3

Change-Id: Idc210abcc4fdb580203897c55862e6f26dd0ace9