Merge pull request #223 from youtube/replication

Fix this test.
Merge branch 'master' into replication