am afd37c42: Merge "Build fix"

* commit 'afd37c429b14d63ee4144f00cf1fb8041f681f68':
  Build fix