STYLE: Remove local variables that are never read

Change-Id: I6438cd17a2ebd4857fba4057c28c72e14e258bab
Merge topic 'RemoveUnreadVariables'

7279fce STYLE: Remove local variables that are never read