am 25e3f428: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '25e3f42871569d5801082825b48c60330d9b60e0': (239 commits)
  JOP36
  JOP34
  JOP33
  JOP32C
  JOP32B
  JOP32
  JOP31
  JOP30C
  JOP30B
  JOP30
  JOP29
  JOP26B
  JOP26
  JOP24G
  JOP24F
  JOP24E
  JOP24D
  JOP24C
  JOP24B
  JVP15S
  ...