Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev