Merge "Remove advanced services tests"