Merge "Consolidate Title normalization code in SearchUpdate"