Merge "Always add local subnet routes to the interface's routing table" into oc-mr1-dev
am: 5e0e5974c5

Change-Id: I04ee4b9123a4b43ea435f771e85f713f4ecbc8fe