am d099cd97: am 80db0db5: am 8b40761a: (-s ours) am 35cf1243: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd099cd97':