am 5ec9e14e: am aa3ae615: am 72c870f5: am 596a565a: Merge "Remove some unused variables."

* commit '5ec9e14eb1c5fccd6514d6199fe442a1b69c2312':