Merge "Add producttype:variant to DeviceBuildDescriptor"