am 23416c06: Fix build

* commit '23416c06c4cb2dba437c4ef749857e085bc76d18':
  Fix build