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

Change-Id: Ia8be3b3e796332a7f960362cc1479662cbb85039