Merge "Adjust testapps for download API changes"
am: 33aea1eaa2

Change-Id: Id355832afce78d3b5e0ff6f44386d73ef660f597