Merge "Fix flaky CtsHostsideNetworkTests." into oc-mr1-dev
am: 91b52b4043

Change-Id: I8177cc215297566af2fb9ac206c5c425071fd3aa