Audio options

Change-Id: I4bb796b9e4369a88981e6a88e03d8c092bccf82b