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

* commit '99a2df71960f4323500b3f1f56e95c53146594c1':