Additional replication state checks.

Change-Id: Iae3a578a0db4fdd2106b49dcd1ccbd3da9c63c02