Also, renamed a local variable. Bug: 147611548 Test: Compiles Change-Id: I4de739c7719321c83ebdd32df13395d9a218c4ad