Merge "Rename type resolution entrypoints."
am: f0e805deaa

Change-Id: I83bb14af4ab43de80374d0f2aa3d617da61785d6