Merge "Fix bad arguments handling" am: 79a2b5215d am: 8c64a5a4ff
am: 70e4d3c3a2

Change-Id: Iab78aec4281338c13d99cf9ab168699d1c24915c