DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: 230c78cec5  -s ours
am: f564bcc159  -s ours

Change-Id: Ie8381ac10bdab3e6ac56a37bd98583e03ea15451