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

Change-Id: I3d0febcb4f3fea230b928ef067a5a36c14741ad6