Merge changes I8cfea8ab,I349611e3

* changes:
  Recover from HAL death in sound trigger
  Lint cleanup