am 43b91298: am 34d12aaf: Reconcile with jb-mr1-release - do not merge

* commit '43b912989f6cddca820e98ff29dcedf83a89ddde':
  JOP37