Easier index maintenance.

Bug: 53482

Change-Id: I58c0fa1f55bda956452c9476fc7b4935cd8dbe73
Merge "Easier index maintenance."