Support Golden and Skomer

Change-Id: Ib135061dcb2f5c13d3a6432db85ac4f4b819f7af