am 71abf355: am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build

* commit '71abf355011906353a571b471c04027bf2112804':
  Fix the build