am ab911a02: Reconcile with jb-mr2-release - do not merge

* commit 'ab911a02af2a5c3977b55cb0994f74635edc7c3a':