[automerger skipped] Merge "Parse IfIndex for Netlink RTM_NEWADDR / RTM_DELADDR event" am: 6effd4d6a3  -s ours
am: 3e8542378d  -s ours

Change-Id: Id5480f66034e087182cb3afa4f741285fccc7ccb