This will allow for replacing the limit-and-offset queries with queries that page in a sensible manner. Bug: T59176 Change-Id: If5c137f68496772f3fff3a735b7b0c388426e518