Merge "Fix CtsHostsideNetworkTests." into oc-dev
am: 569fdfd845

Change-Id: Ie9c3997824ff4ecbf853078c0714424cd149c361