Merge "ConcurrencyTest: re-enable WiFi during teardown" am: a49620ff08 am: 8cf5a71ec0
am: 074b8b0de5

* commit '074b8b0de5e92699b5ad11f7a237df892710d518':
  ConcurrencyTest: re-enable WiFi during teardown