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

* commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':