Merge "Remove streaming URI from default logs"