Reconcile with jb-mr2-release - do not merge

Change-Id: I476bbd02389437601ba40b8c2436d8468cb5f892