Merge "Correct NFC route setting when DefaultRoute is not HOST"