Merge "A few more changes to make the local TestService build again."