Extract tag type and include it in returned type struct

Bug:
Change-Id: Ie60184dc58bf8c3abd9a4b229bcf68f7f47ca46a
3 files changed