Merge "Use a proper key length for the mode." into nyc-dev
am: ad8e26297b

* commit 'ad8e26297b07f26376bd3125b11ae280304c22e8':
  Use a proper key length for the mode.