Merge "Fix TrieMap: Cannot create next level map of small value entry."