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

Change-Id: Ib673a2ba3355bed4a65e88b2e660fb4ceecee6ae