Merge "Add app_api_service to time_detector"