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