Merge "run-on-host fixes"
am: ef0adb1275

Change-Id: Ie4bb92b12050ae868521a30ff9b6bc8e52175235