Merge "Restore audio tee sink" into nyc-dev
am: 1bf4df7d69

* commit '1bf4df7d69a639e38fecf962e533244f98878e3f':
  Restore audio tee sink