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