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

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