Merge "Update current.xml to be in sync with deprecated tags."