Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1
am: 9c84160545

Change-Id: I9091af58eb06d5bf89847ac35aba9849e5e758cf