Merge "Add ProductVariables.DeviceName, set defaults to flounder"