Merge "Fixes for host bionic support" am: 6609d6fb43 am: e0b553c6a8
am: 0e870b68aa

Change-Id: I846d3829881c688aa9035fdc971c765c1dce73c9