Use gender neutral pronouns

Change-Id: I068f08b59091589adaa703221277ab34e3f3ba93