am 7c5109be: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '7c5109bef8c1f8b857b043bf9c1d26c2f0556e8f':