Merge "Internal speech recognizer fixes." into lmp-mr1-ub-dev