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

Change-Id: I0e4867b931bdee95e581e2769b182814cb23a531