am 03d1dff3: Merge "Fix Binary dict tests"

* commit '03d1dff38d4de0f043420aae8a292d74b531324a':
  Fix Binary dict tests