Merge "Separate capabilities service method from account_client"