Merge "Add Adrian O Sulivan as committer"