am 2b40124d: (-s ours) am 82278b2c: am fe9611bd: Merge "Fix potential leak of audio input handle." into klp-dev

* commit '2b40124d81c84381b2b21313b4b6c7d0449883d1':