Merge "Actually remove the chooser APIs" into oc-dev