Merge "Add metadata for the dimension annotation, and strip typedefs" into nyc-mr1-dev am: 975e54d366
am: fa167ff4dc

Change-Id: If654157ce7ee1c9d211ce4586dde6c408ca40361