Merge "Add more owners of API directory"