Correct Joe Gordon's affiliation

Change-Id: I5f8ceaaaae79f6ce83c2349cdd473154a4252067
Merge "Correct Joe Gordon's affiliation"