am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev

* commit 'ae309489c2b22c6cfcc6701b5dea13c652239ecd':
  Fix race in RecognizerService teardown.