Reconcile with jb-mr1-release - do not merge

Change-Id: I77d91a9ffb6db5b62cb01f1ddeb288dd50787a8a