Merge "DO NOT MERGE:Deflaky testLoggingStats_search_success" into sc-v2-dev