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: 7b5cb8ae" into rvc-d1-dev-plus-aosp am: ed883250 am: b5e0c931
Change-Id: Iad2cc301ecdb7ad73953aeabb32e90d8cdf234bf