Merge "Remove old private constant from ResourceId."