Merge "Add metadata for the dimension annotation, and strip typedefs" into nyc-mr1-dev