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

Change-Id: I5445989fd1dd6e851d3efe060cf3fc4ae1d104fb