Merge "Adjust testapps for download API changes"