Updates from code review and CQ#4016
Updates from code review and CQ#4016

mklight/eCMD,open-power/eCMD,open-power/eCMD,open-power/eCMD,mklight/eCMD,open-power/eCMD,open-power/eCMD,mklight/eCMD,mklight/eCMD,mklight/eCMD