[automerger skipped] Merge "Track local network ifindices in sInterfaceToTable...
[automerger skipped] Merge "Track local network ifindices in sInterfaceToTable as well." into rvc-dev am: a01afdb6 -s ours am: 77bd001b -s ours
am skip reason: Change-Id I8042e5b91bcb3175d9ad540526df396a139976f0 with SHA-1 484d02ed is in history
Change-Id: I866d3265289578b053f14d5b90f43a7079a5deae