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

Change-Id: I0ca842e1a2c2986c0b6fa9d7eca162cb2cb737af