Fix a corner case where oneof customizations are ignored and simplify the interfaces. #1506
cl/713280456% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.
Pushing new commits will allow the pull request to be re-opened.