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

Change-Id: I3b64f7eed95f3fb1670e9fdf4f3825b1deeddfad