Merge "Proper fix of am args."