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

Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c