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

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