Merge "Change a few places to use string version of GetTypeId"