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

* commit 'f8fbfd9fcfc311c66c37d3e63e1feb01726e0b4f':