Merge "Rewrite TypeLookupTable." am: 75aed5d2a1
am: 40037cfd6c

Change-Id: Id447b2dfd67fdfa8be7236cc030d2ba963cdb77e