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

Change-Id: I9db90765647d0218de569565d7a23ab3c12ca044