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