Merge changes from topic "presubmit-am-5961645944e5403eba336e69e912a511"
* changes:
[automerge] Update the test directory structure 2p: 458e53e8 2p: 383865ab
[automerge] Update the test directory structure 2p: 458e53e8
Update the test directory structure