am d3ef8914: am a11e2d20: Reconcile with jb-mr1-release - do not merge

* commit 'd3ef89148cde944aa1b02a2e8410168a9695e208':