am 5ab56553: am f8fbfd9f: Reconcile with jb-mr1-release - do not merge

* commit '5ab5655343591baa8b315f8f0513112a1798d389':