Merge "Fix wifi tethering tests." into lmp-mr1-dev