Merge "Add trie based greedy prefix construction"
am: 8f0f3b9784

Change-Id: I4d310ba72b8d9fc7a21b76835a36106f0c05a3bb