Return send-command block to Demo.xml

Cherry-picked from release-0.4 branchy

Change-Id: Id5a502277d7519af9622a8045d85b3e44403a403
Merge "Return send-command block to Demo.xml"