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

Change-Id: I61353b48b75a6e555520dfa9d51d0a404aa8a09f