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

Change-Id: I59072d11b99d74f318f46dfb8e46891830424c58