Merge "Use structured format for verity metadata"