Merge "Remove module-level WifiCheck preparers" into nyc-dev am: 4e0eb2e458
am: 769683c76d

* commit '769683c76dda1db7659724ce915f903c8cf95ee6':
  Remove module-level WifiCheck preparers

Change-Id: I5cc73a5cd3d05e21b590203a9ea399ef864cc9ce