Merge "Security-related cleanup for network scoring." into lmp-dev