am e87d36f8: Merge "Revert "Remove unused apache related API.""

* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."