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

* commit 'd1c1988f1dea1c2946cca61144229eb74c893630':