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

* commit 'd2c653514cd77fc8ce73c4da40ac9e2a9d4a74f5':