Merge changes from topic "presubmit-am-1e7fa8f458a24c9bb07a3501870823fc"

* changes:
  [automerge] Fix some history issues 2p: 4d46dddbe7 2p: cf0c8f9868
  [automerge] Fix some history issues 2p: 4d46dddbe7
  Fix some history issues