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

Change-Id: I7ec526079d2892a0692342769a499b86ec909ca3