am f2d39998: am f05aeb64: am 2e58670d: Quit using ExpandableDictionary.

* commit 'f2d39998811f2d227c42cd00b52e3c303b83dc95':