Merge "Avoid AllowedNetworkTypesListener NullPointerException."