Speed up admin script by adding an index

Bug: 70775
Change-Id: Id5489291455243f604e316db83f106f0578720d5
Merge "Speed up admin script by adding an index"