Merge "Enforce READ_DEVICE_CONFIG in DeviceConfig.getProperties path."