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

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