Merge "Fix sync back-off" into oc-dr1-dev
am: 9fd497cdae

Change-Id: I029aaf190316aa0e7924fda472fdcf718050f4d4