Merge "Differentiate the default route with the device route" into rvc-dev