am 0c958246: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '0c958246': (49 commits)
  JOP30C
  JOP30B
  JOP30
  JOP29
  JOP26B
  JOP26
  JOP24G
  JOP24F
  JOP24E
  JOP24D
  JOP24C
  JOP24B
  JVP15S
  JOP24
  JOP23E
  JOP23D
  JVP15R
  JOP23C
  JVP15Q
  JOP23B
  ...