Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
am: a7579d6325

Change-Id: Iba59e93875c28b8e30db0c013575bc2f117cb16c
tree: d130fc3fc821e9daa4895ac7cd27b31d96c5b818
  1. core/
  2. services/
  3. tests/