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

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