am 16cb8655: Reconcile with jb-mr1-release - do not merge

* commit '16cb8655bd96cf32d192acd787d27504153a96ae':
  JOP40F