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

Change-Id: I36a5e7bfd26fca61b3392b3f1e4ed94ea97d74eb