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