Merge "Merge "Update CTS media file download URL" into nougat-cts-dev am: a7a9ca31f7" into nougat-mr1-cts-dev
am: 81d7c082f2

Change-Id: Ibb33d83341d6f8dddee4efd8f106ef015fd17e53