Merge "Remove unused buildNetworkIdentity"