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

Change-Id: I703e29979e026bdbac00dbce8dd6958eac0c40aa