Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715
am: 5eb5ec71fa

Change-Id: I17b1d21e5b7dd5f22a773aa201e0ca42e5038fa6