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

Change-Id: I7cdec245e3a5abb944e5cdc7f23106a6225d392a