am 552346a7: am 106f9b24: Patch from Huahui Wu.

Merge commit '552346a743be7c8b10893f817238e92938866999'

* commit '552346a743be7c8b10893f817238e92938866999':
  Patch from Huahui Wu.