Merge "Revert "Revert "Remove unused apache related API."""