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

* commit '34bdc6136f13d01af339fd0c8f1f569bb28d6971':
  Fix the build