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