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

Change-Id: If077f431c0e61691f2a8a8ffe2960a557050b198