am eab12de7: Merge "Remove unnecessary globals."

* commit 'eab12de70efb649ab33f7971e948251895d613fe':
  Remove unnecessary globals.