Merge "Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e7 am: d9a8191a" into oc-mr1-dev-plus-aosp