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