Merge "Add app_api_service to pac_proxy_service"