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

* commit '322b973788ce7eeed8c08fbfa77a93fe43f803c2':