am 804e618d: Fix build

* commit '804e618db6240a6c253c0d3eab2232b1823e217a':
  Fix build