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

* commit '62fcb21577ccdd68dddd6b6984ad0ce58ee0c228':