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