Fix replication checks

Change-Id: Ic0ebdf99ad754d1b881852b7964497c29a045f0a
Merge "Fix replication checks" into production