am 937c699b: am ac71270e: resolved conflicts for 57b578f2 to cw-e-dev

* commit '937c699bbef40bc1d4bc14de35d5008e2c0eaf24':
  Phone rebooted when trying to select problematic WiFi network
tree: 6b3974ccf938d60d193023ca9e811ba6acd562d6
  1. service/