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

Change-Id: Ib0712e6fe4412009d01bdaf00ca88b84c24471a1