Also clean up unused variable. Bug: 15567083 Change-Id: Id83a3784bbe88520a4ffe654b2553d36a7b8e5bc (cherry picked from commit 2f9e2150)