am 6effd738: am 629ac4c4: Fix incompatible issue.

* commit '6effd73808f68ddf3abe99fe7d2522bd52c6b868':
  Fix incompatible issue.