am 2b1e1696: am eafff65b: am be4d85fe: Merge "Fix bug and Add large test for decaying dictionary."

* commit '2b1e16966ced9df87383d02ddad8856bf7885107':
  Fix bug and Add large test for decaying dictionary.