Merge "Mark old APIs as @removed"