am 83285cec: Merge "Add ProductVariables.DeviceName, set defaults to flounder"

* commit '83285cec5f854c3e0fc91b51a39e1a69a058093f':
  Add ProductVariables.DeviceName, set defaults to flounder