Merge changes from topic "presubmit-am-920728afe9194d408e2a3cddba72bbcd"

* changes:
  [automerge] Annotate mainline code runs on only some versions 2p: 586ac4b654
  Annotate mainline code runs on only some versions