Add metadata for the dimension annotation, and strip typedefs
am: 5dcac27d68

Change-Id: I0010de39d9d39f6304d1cf16b834280d6908fffc