Merge "Annotate atomic DeviceConfig methods for testing."