am 96fb5d20: am e3d9a675: Merge "Remove unused variable"

* commit '96fb5d20388464bb9470f6d47e26f34058c36ac3':
  Remove unused variable