am 25bab830: Fix build

* commit '25bab830af062dcaef6f75220066b221fd30957e':
  Fix build