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

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