Merge branch 'stable-3.7' into stable-3.8 * stable-3.7: Track replication started vs replication failed refs Change-Id: Ic0d13f7994cba43ca960e7dc6a32bb18fcfc9a9f