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

Change-Id: Ic03549017c29b05cae9363483b3e980723a3817d