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

* commit 'd612ec14226d082d246d8448637d15888733a8b9':