am f94705f5: am 8b308ed7: Fix build

* commit 'f94705f5fba8da61b0cdfc3c08f54a8ee66e1a42':
  Fix build