Merge "Always add local subnet routes to the interface's routing table" am: 981228be am: 5fb26a12 am: e3469a42 Change-Id: I21f4231c968b37cdcf1565279eedfb990dbc583b