[risk=no][no ticket] e2e minimatch resolutions (#7138)
[risk=no][no ticket] e2e minimatch resolutions (#7138)


all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench,all-of-us/workbench