Merge "Fixed HostApd VTS test failure." into tm-dev