Merge "Move add-to-whitelist APIs."