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

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