Reconcile with jb-mr2-release - do not merge

Change-Id: I480c3dcdb8b1541a9d463ed11a6a90f34535aacb