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

* commit '6eb0fe2b02bcc7d82ba23df6cfaef0369e7b068b':
  Switch to g_ for globals.