Reconcile with jb-mr2-release - do not merge

Change-Id: I826424d8cfe5a04e8cbf0b623863a6476b0bf128