fixup: unbackport the RequestOptionOverride tests from 8246c03f