Support Codinalte , Golden , and Skomer

Change-Id: I2a9f1d77cd2e749a0b3d2cb23c558d91e615dce8