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

Change-Id: Ib279bd04cbdf030104d077b9a2a836a348322476