Merge "Correct NFC route setting when DefaultRoute is not HOST" am: 6b7c3fb5c5
am: 701c1258c6

Change-Id: I43cafd3efa5eedf76fd3e18b5ba6bc2434096724