Merge "Fixes for host bionic support"
am: 6609d6fb43

Change-Id: I89e3e5869658a9c5c198f0e55c94a33b706da444