Merge "lshal: add wait command"
am: 392c8417d9

Change-Id: I2e36e54a18777195664f038fd0cc625bd41d5d58