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