Update DataHousekeeping for post-CoreData world

Change-Id: I86d6a4ae85c5491e6d0db51aed0cc4e7a87ee427