Fix up inconsistent variable names.

Bug: 29065081
Change-Id: I1c8305afdebd7e1eedb4afafb0d06003c6a9e576
1 file changed