merge in jb-mr1-release history after reset to jb-mr1-dev
tree: 0dd412ed9acf38f807b6a2bc0be1ea365e4b4cac
  1. kernel