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

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