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

Change-Id: Ife328fef3a7cc1a88562fd88a85daa626b19c930