Merge commit '311757b' into audio

Change-Id: I8f9e12d825e88003953a8d5f56575b7fe7aef70a