[INTERNAL] fix for type handling

Change-Id: I1f367d91ae2057c105e9957d856ff9f761e1b7a7
Merge "[INTERNAL] fix for type handling"