am 629ac4c4: Fix incompatible issue.

* commit '629ac4c4f8cf9b060bd95bac3c69e6caa201770b':
  Fix incompatible issue.