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

Change-Id: I676e94de2cbbc9941fe4a895a55b2d5325babb88