Merge "cmd: fix compile error in DEBUG" am: 6d24b1ebe8 am: 9b3b0e0461 am: a5933aa6ec

Change-Id: Ifc33972efe4f040e7be82b86d27aec48574ebeb8