am 270ee0c6: am 34c380aa: Reconcile with jb-mr1-release - do not merge

* commit '270ee0c6c62e1bcf278892094653e7ab008b3685':