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

Change-Id: I3d4b9a1da6678341d09da06e1e1ae13c2adae11c