Merge "fix javadoc on downloadmanager.remove()"