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

Change-Id: I85a7c6dd4485fc0e6885e4c2b93f2908474cbda0