am b7afc4e1: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'b7afc4e15b29d933477328d1944c3201337808c6':