Merge "Add nullable and nonnullable annotations to DeviceConfig."