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

Change-Id: I9ec45a0030788003efffc83bdc73ad8393d384ee