Change-Id: I5573995adfd52fd54bddc62d1d1ea78fb1328130 (cherry picked from commit b0f9a023) Conflicts: command.py
mentioned in commit 6248e0fd