Merge "Update current.xml to fix build error."