Merge "Always add local subnet routes to the interface's routing table" am: 981228be38
am: 5fb26a1270

Change-Id: I3e0aa03b46b77bd65aa301fec28f4f6ab5de5c62