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

* commit 'f1e72279ffbff47ef404e8f7d8c9bd7306f8382d':