Merge "Add DeviceConfig switch to disable new dev ID access restrictions"