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