Fix Flickr imports in UploadWizard

Change-Id: Ia7ae240fdfae35f20ecc584366927680de124692
Merge "Fix Flickr imports in UploadWizard" into wmf/1.25wmf12