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

Change-Id: Ic019a0f04737d128cc5005be8fe9733f30ee44a3