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

* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.