Merge "SF: Use last call time to rate limit resyncs" into oc-dev