Merge "Remove unused fields in ForeignDBViaLBRepo"