Missed a couple of uses of command-executor-api

Change-Id: Ib48eb1a60dba9b652efe9968cd451dbf755df6a8