Merge "Fix Download Manager Functional test and enable for APCT" into nyc-dev