Merge "Merge "Differentiate the default route with the device route" into...

Merge "Merge "Differentiate the default route with the device route" into rvc-dev am: 6ae19bbd am: ccdc92ce" into rvc-d1-dev-plus-aosp am: 3c008f46 am: 0ffc8fdf

Change-Id: I09fc269e7b55d9c1df91c10be5905f6ed3a90ca4