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