Merge "Differentiate the default route with the device route" into rvc-dev am: 6ae19bbd am: ccdc92ce Change-Id: Icb1bb6557ebe80dfd64125dac21c1036981a6626