Merge "Convert server acceptance tests to use Google Truth"