Reconcile with jb-mr2-release - do not merge

Change-Id: Ia5c29124c5251cfba762c1a19190fe3c02d8bf42