Merge "Don't create empty .wav files" into pi-dev
am: cdcfb309e2

Change-Id: If1e4197bb8703985dbff32079bbe504797ef1c3e