In the git import, deal with r316, r318 and the corresponding tag by