Merge "Add Rfc6724 style sort for DnsResolver and fix potential bug" am: 7a1133eb44 am: d352f4ca85
am: f6afc1cbc7

Change-Id: I913b31586d15c24d1535e8d7cd0b158c25892286