am 32477a8d: am 8d5f8e2b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '32477a8dbf812795a19529d52c4ec2e079989cef':