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

Change-Id: Id24a1a733d49a84a782a16916b982d7c4ead5ecf