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

Change-Id: I5e66fca043d960bb82f220592f74b260f43365cd