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

Change-Id: I21f4231c968b37cdcf1565279eedfb990dbc583b