am f614de62: Merge "Cleanup ExpandableBinaryDictionary."

* commit 'f614de62aaeae80d4be954ab5caaeee84f5670c2':
  Cleanup ExpandableBinaryDictionary.