Merge changes from topic "presubmit-am-2e6682945baf48078df3b24cf22f6b07-sc-dev" into tm-dev

* changes:
  [automerged blank] Rename test to correct CVE. 2p: 486f5d6d62 2p: 854e4aabf3
  [automerge] Rename test to correct CVE. 2p: 486f5d6d62
  Rename test to correct CVE.