merge in ics-mr1-release history after reset to ics-mr1
tree: 2c7f0cfcb842a5f65f1081f5786908ed1286642e
  1. core/
  2. services/
  3. wifi/