Merge "Fix bad arguments handling"
am: 79a2b5215d

Change-Id: I903bc30acb4822b3df231be343ac9dbce7584661