These were just to support the queries that were previously removed from ChangeAccess. Upgrade the schema to get rid of them. Change-Id: I32b7adc37c0899b9821df2bfa261a39525b370f9