Fix contributors cause someone added their name all over the place in place of other people

Change-Id: I6a3beeeef07ccf8b26a0bab6c7993fa54ba40432