am 48f280cf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '48f280cf257c8cc27ffef1758dca8834c61fe14a':
  JOO88
  JOO87E
  JOO87D
  JOO87C
  JOO87B
  JOO87
  JOO86B