Fix getting the proper S3 path

Change-Id: Ieffd75b5abffc96e30ae48a0c870233e2d371c94