Merge "Fix speech state event javadocs per API review." into tm-dev