am 15c13bd6: Merge "Switch to g_ for globals."

* commit '15c13bd6cc0ce44d8f083f75d0bfa926a88cc169':
  Switch to g_ for globals.