Merge "Add test for type resolution." am: 5835d9ea59 am: 168bb896b7
am: 6cc9f50bd3

Change-Id: I3b0b96e0b46e3dda87c1441146ece36376eec092