Reconcile with jb-mr2-release - do not merge

Change-Id: Ie1d9fd280ad0b593e75ce17c11e45d34cf6df4ab