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