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

Change-Id: I68b0b5ea6c9f6cc3a9c69593fdedf386b65c5d08