Merge "Change APIs using String instead of ResourceType."