Merge "Rewrite TypeLookupTable."
am: 75aed5d2a1

Change-Id: I759490b514140c76547d71731807486a60ff9186