Merge "TextIndex.java-extract the assignment"