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

Change-Id: Ic69db23c3b1ba493a97b162caa664759cf3b1bda