Merge changes from topic "presubmit-am-388b5529f4bd487486316e45dbc7eb8c"

* changes:
  [automerge] Fix broken test 2p: 38c746e1a7
  Fix broken test