Merge "Fix wifi host tests." into pi-dev am: f6e8fc9bdf
am: a31a3e4450

Change-Id: Ic8fa0165b3494098e659ed4f4549b01d7487c907