am bc43e3f2: Reconcile with jb-mr1-release - do not merge

* commit 'bc43e3f29060252d2a08b4e976bdb2ca50438623':