Merge "filerepo: Avoid two pointless substr() in File"