Merge changes from topic "presubmit-am-8134571e02a14812820dc4626241cf6f" into sc-qpr1-dev

* changes:
  [automerge] DO NOT MERGE:Deflaky testLoggingStats_search_success 2p: 2c01a0bb7e
  DO NOT MERGE:Deflaky testLoggingStats_search_success