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

Change-Id: I88a834e7387c03043a0571ba545a2c5c9fd320a3