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