Merge "Fixing a race condition in RecognitionService" into gingerbread