am 10a36fb7: Merge "Stop using ErrorStrings for apache."

* commit '10a36fb749d05bd90fc8ef3114562cacb631c07c':
  Stop using ErrorStrings for apache.