am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f91bd41c46ec8bd085c361ea0bdf53efe13c87ca':