Reconcile with jb-mr2-release - do not merge

Change-Id: I73bc6567706973507090e4c9bc05cd61ee850260