am 7451897c: am e6c27a7a: Merge "Fix a typo in the big g_ search/replace."

* commit '7451897cd45c7dceb52803400c5f979692013c4f':
  Fix a typo in the big g_ search/replace.