Merge "SoundRecorder crash if click start/stop button quickly" am: 244b758346
am: f1cfef4ea0

Change-Id: I8568ed91be176f4b03f4d0a9b50be0ab4d985fc0