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

Change-Id: I9af113f8fcff7ce8d4818db45b1fe0e70ac4ff27