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

Change-Id: I08c2ade7b2e27df1e9a0e27a65a0e8107065ec7d