Merge "Remove bogus field references in DerivedPageDataUpdater"