Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b' * commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b': Support new URI structure for download provider.
Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b' * commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b': Support new URI structure for download provider.