am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev

* commit '269aad530493ccdd7ec78c1704eebd4476348b5d':
  DO NOT MERGE Make mute/unmute work