Consolidate S3

Change-Id: I26a58ecc1c27eb34e4c4d528c05993a5dece8705