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