am fdd8551f: Merge "Fix build"

* commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28':
  Fix build