Merge "Remove unneeded uses of optional_api providers."