Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0' * commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0': Adding a lock to stop so that stop will stop utterances
Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0' * commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0': Adding a lock to stop so that stop will stop utterances