Merge "Check for valid last reported deviceId when starting service"