The old way will still work, but prefer s3:// now. Change-Id: Ia1f8eba22016044aa5ffe50b2ab898908aef1890