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

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