am d7823c5d: am eab12de7: Merge "Remove unnecessary globals."

* commit 'd7823c5dfed67b1e8b0e175e588fb2dc643ebc65':
  Remove unnecessary globals.