Merge "Allow PermissonController to find app_api_service and system_api_service."