Merge "Stats: Marked service as app_api_service"