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

Change-Id: I77f4f3522bbc7f2ced0f8dc8316ea46e38f02fa3