Merge "conman:  Fix a flaky test." into wifitv