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

Change-Id: I3b9a0268d80e9cc0d5b4dc77ce67653c5eed73b1