Merge "Fix NativeDaemonConnectorException issue accessing null object" into nyc-mr1-dev
tree: 9f84b4b8acddce1082ba821c91a2e6f25f8eaa1b
  1. core/
  2. services/
  3. wifi/