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

Change-Id: I645db66e377a7f385129f72507f19036d4029445