Merge "Add interface info to .rc files" am: 98d0f4d52c am: 37298a7616
am: 3531ec0183

Change-Id: I9a48f01064e6b64fdbd3dcae3623163a27998703