Rename functions to avoid confusingly similar names.

Bug: 132429380
Change-Id: Ic73b6129cb907d07f23fff0cd396eeb1d76489dc
1 file changed