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