Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: Iefcd2a29c958299abc4cdfd7217f6f3deb7d483e