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

Change-Id: I9936340ef1544aad7b8115dc37e3fb9094ed0e2d