with improperly skipped subcommands Closes-Bug: #1552158 Closes-Bug: #1551675 Change-Id: I51d6d318b0e31c2351b2b5496e3c9ad8d29a9e8c