[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 skip reason: Change-Id I8042e5b91bcb3175d9ad540526df396a139976f0 with SHA-1 b6dc40ac is in history
Change-Id: I03cb403a2f681c6e3110a4ca0d771a6403757bd4