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