Merge "Add back pkg_host variable during transition"