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