Update for colliding names in arguments and results.

Test: compiles

Bug: 33277700
Change-Id: I0c1a62fdea3617a06120f548105f778e011cb576
1 file changed