Merge "Don't assume all downloaded files are under top-level Download dir." into qt-dev am: 1c54f85d am: 2bce6a50 Change-Id: Ic2156dc0fbb3fc93fa52743fae9267f8d5cb414e