Merge "Remove unnecessary container-tag file"