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