Merge "Fix error message for invalid deviceId in updateDeviceId"