Merge "Add interface info to .rc files"