Merge \"Fix NPE in WifiScanningService\" into nyc-mr1-dev
am: a03e931932

Change-Id: I6c6a9d2faa83e740160edae707a24180c29b424b
tree: 5858086eb7914e356084ccb91573cff0ec974b5b
  1. service/
  2. tests/