am 37368d7a: am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev automerge: d2fd1bd

* commit '37368d7ae493ad39c5ec8bb70afe64fcb0f6c31f':
  Fix wifi tethering tests.