am cfc09248: (-s ours) am 07f11e34: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cfc09248d393baf1214d338a0b004a23869d3bee':