Reconcile with jb-mr2-release - do not merge

Change-Id: I591e946be4fc393dc8e10d8dc64ba9b2c6cefe66