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

Change-Id: If5917c6ef05f6edbfc80eca05d74f0dbd205a64d