Add overlay for Focal
PS2 remove redundant lines

Change-Id: Ib28fd19629b477eb9c570bf928c63305bb77bace