Merge "Add DeviceConfig namespace for Supplemental API"