Merge commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c' * commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c': fix sync exponential backoff for expedited syncs
Merge commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c' * commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c': fix sync exponential backoff for expedited syncs