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

Change-Id: Ib27503cee1406495023925f5a80771190bb967aa