am e37fa977: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'e37fa97752cb0e8b79b94f1c1745894b40b7d57e':