Remove with_no_trimmed_paths use in query macro
#152017
Merged
with_no_trimmed_paths use in query macro
#152017