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

Change-Id: I8495c25b6b02c9d61f278ac2875668c86a42bf19