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

Change-Id: I704f9895ddd4c4fc2ab50a927939aee67a916fae