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