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

Change-Id: I4edd8083cc9775c745d3f24d8bfc7184f7f6a70a