Shamu: Potential audio loss fix

Change-Id: I897b5325aba06af0bd177653afb4a68bb8539e52