Reconcile with jb-mr2-release - do not merge

Change-Id: Ib821de8f91e2992b52565dbd8c10a94e37c0ee45