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

Change-Id: I50f62ed18d78ba3cb35185359e9e484c320afa34