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