am 228674f6: Merge "fix findWordInTree." into jb-mr1-dev

* commit '228674f6c7ce8891ca6b358db94da921712d9960':
  fix findWordInTree.