Merge "Fixes for host bionic support" into dev