Add safety net to prevent sync stoppage

* We added this change to HC/MR1 and HC/MR2 in DO NOT MERGE CL's.
  Adding this in manually now

Change-Id: I053380353009febffcc6c4a016a20cf2dae79f5f
1 file changed