am 4e9fb840: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4e9fb84063a2ad84df45ade41d301ec3aaf06160':