am 0f4d2683: am 79ab2553: Reconcile with jb-mr1-release - do not merge

* commit '0f4d268311249113eeaf937dbe51ad2d94c7063f':
  JOP39B