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

Change-Id: I14f58bf34aaf5bc683334aa8fc0859fa8044c69d