am bbbc7e26: am 6c368d28: Merge "Fix build - configure for schema-v4 output"

* commit 'bbbc7e26be6a05e993570d0908eb8b06ae88e5fb':
  Fix build - configure for schema-v4 output