Merge "Remove use of ConcurrentHashMap from FWaaS transcriber"