Merge "Revert "Implement Account Discovery API.""