Merge "Add check that TypeIndex is valid in StringByTypeIdx."
am: 1cda71a414

Change-Id: I505a522a49d67bd0bc42b1b2df2731da818f8700