Add clayton-oneill

Change-Id: I5e743bf66c70cb3268de71606556d89dab0f9766
Merge "Add clayton-oneill"