Merge "Fix HistoricalAppOps collection."