am a9f0a963: Merge "Handle user dict as an ExpandableBinaryDictionary."

* commit 'a9f0a96377395e079b8cef5494e9e01b92b1b7ab':
  Handle user dict as an ExpandableBinaryDictionary.