Merge "Rename type resolution entrypoints." am: f0e805deaa
am: 87dfb5a323

Change-Id: I69f8da4a4638e56deb9c2a54f76888ad49d5bd63