am f05aeb64: am 2e58670d: Quit using ExpandableDictionary.

* commit 'f05aeb64d9761b82a2b47a2b09621a34cd604049':