Use nested format when listing commands

Change-Id: Idd11e6562b3a6edd9d0cc872821cc2b9d60d2d0b
Merge "Use nested format when listing commands"