[automerger skipped] If command_timed_out() is triggered don't get blocked by...
[automerger skipped] If command_timed_out() is triggered don't get blocked by a deadlock am: 4e9e3bfe -s ours
am: b281ad66 -s ours
Change-Id: I67642140400e11beb5e2c124e081a7895d626d2e