am 0fd6b1d1: (-s ours) am 76572c63: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '0fd6b1d1e2acf2ad5f35f83fcdbdb30f0e1c4eb5':