Move this to the common devices repo