Merge "version_policy.c: be less verbose at build time"