Merge "Better handling unknown uid case in network watchlist service"