Merge "Add a constant for ISDB_S3"