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

Change-Id: I0361681be0015e941c4749e7bd7be54e254639cc