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

Change-Id: I49ad720fdc4c78ba8003d1fde69c6b8a92798501