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

Change-Id: I5ed80e588eaaed9872e22aa2c0a362723a698f3a