Merge "One last change to current.xml for new download manager API" into gingerbread