Merge "Rely on PlatformCompat instead of DeviceConfig"