Merge "Clean up SearchSnippetColumns API (3/3)"