Merge "am dumpheap throws error when arguments are after file" into main