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

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