am a6f37679: am d84f0294: Reconcile with jb-mr1-release - do not merge

* commit 'a6f376792eb8910ee4a76d59b48ebe5fcd2f4aec':
  JOP38C
  JOP38B