More Audio work

Change-Id: I04b7beb59f8cd67c0b26d57c38e608f38da83594