Merge "maintainers: Add new maintainers"