Merge "Remove unused variable." am: f3b1881bb2 am: f338ed34f9
am: cab27fbbf4

Change-Id: I454d6359029bdbffa5e124e31759f30d6aec5f76