The cleanup command in the external API is a misnomer and should be called destroy. Change-Id: I083e80699e09bb24266ce1bf549772a5de92a49e Closes-Bug: 1610364