Merge "[FileRepo] Various ForeignApiRepo fixes."