Merge "Remove unused using statement / host stub"