Reconcile with jb-mr2-release - do not merge

Change-Id: I823f0c7f5fd55d748e7651188eb7ff1edace6dfe