Support Golden and Skomer

Fix codinalte someone broke it xD

ps6: tweak branding of product prop overrides
Change-Id: I688ea899bb6d31309e8183ee56a6b659ae6555a7