Merge "Additional fix for coversion from type-id to type-string." am: 628484644a am: 234e7aa244
am: 8cfbe0b524

Change-Id: I020e8e862e9522c85260a64c1d6e741b6316b9ed