Merge "Differentiate the default route with the device route" into rvc-dev am: 6ae19bbdc2

Change-Id: I5ecfdc4b6129a577cff397818631b588133ed5a1