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

* commit 'b1596afa59c7108cc6ce23bab54a1bc41961806a':