am daa3e04e: am 2e939805: Reconcile with jb-mr1-release - do not merge

* commit 'daa3e04e485a037b38ff0d97a04fb1e0d139b143':
  JOP40C
  JOP40B