am f3456803: Reconcile with jb-mr1-release - do not merge

* commit 'f3456803fed4ff529dea53fd9bc338887886acf9':