Merge "ART: Fix wrong command line parameter"