Added missing prefix to some indexes

bug: 37921
Change-Id: Idb2435ea0e2352f38740b87b38e4cbb40727bdcb