Merge "Fix bug with broadcasting the wrong audio state"
am: dad9becec4

Change-Id: I289bd26ff85994a2995020d96baddc1e08387117