am e08bbe5b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e08bbe5b6d1d5db8f057c840773b435f869384cd':