Update James Li's affiliations

Change-Id: I71e46ffab3ec879363711c2825da417242082a3e
Merge "Update James Li's affiliations"