Merge "Remove more references to kIndex_8"