Merge "Replace Hashtable with ConcurrentMap" into stable-2.6