Patch moved to device-common