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

Change-Id: Ibe9259c2fe40aff577489948a55d27f1398955f6