Use archive_userindex for speed

Change-Id: I9fb7f79040016e7cd7dc2e4e395307f1b2acd4b5
Merge "Use archive_userindex for speed"