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

Change-Id: I0477b4dc3e782752a556003ddaced227d2271b06