Merge "Change a few places to use string version of GetTypeId" am: 8cb0bc28b1
am: c7534d1f65

* commit 'c7534d1f650a9179e204c16a2ac5b16f7257cd5c':
  Change a few places to use string version of GetTypeId