am edfd0cb4: (-s ours) am 99a2df71: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'edfd0cb4a7636feb039f940bccbd2f8f61a2de53':