Add back the sixpack command

Change-Id: Ia5369c9a973d08b76fbdb4d991357a707bcf4849
Merge "Add back the sixpack command"