Merge "DataChangedJournal: Make nonfinal to partially fix a test breakage."