Merge "Add test for type resolution."
am: 5835d9ea59

Change-Id: I5e267d4f2e05c1441d5c5edcb5d635bc9b7b79b0