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