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

Change-Id: Ibdf4b93647b5f8aaff083a07d5ae1087fcd30f53