Fix Focal on d2s

Should work on all d2s but not tested

(Patch Set 2 - Remove UnNeeded lines)

Change-Id: I3754d388ea00820c2b2c25bd995d01c8cc8b4f32