am e803e609: am 799f5126: Fix build (tests)

* commit 'e803e6095e007563df939326fdd3ca5109619a42':
  Fix build (tests)