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

Change-Id: Id9ecf8b6aeb8ce3b084c1aa21096a0dc03e3fb7c