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

Change-Id: I0b1728fae18c891d91fafdfbb1905c05e0fea47f