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

* commit 'f763b2fc07ee79045ca6c47e54d09dec90694e6c':