Merge "Connect WifiScanner synchronously without sync barrier" into nyc-dev
am: 2657981

* commit '2657981836e6fabbfdb8952716d26de0ac4942ba':
  Connect WifiScanner synchronously without sync barrier

Change-Id: I787b40d618a6013a93dfe3859695114f21c95fa7