am 77acfc4d: (-s ours) am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '77acfc4d6dc30f0b46ade8c6e12445065a2520eb':