init: fix undefined behavior in ExecuteCommand am: d67a4abc64 am: 279f3d593f am: 737d0f5265
am: 86e7b8c3c8

Change-Id: I9c844355f3b35722abf62dd9d164af5eac815ea9