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

Change-Id: I686cdf493c592d52eb2718fa4e42f22b902dd84c