am d33c6c0e: Merge "Use structured format for verity metadata"

* commit 'd33c6c0ef2a7b28b66aa372579bb8b2ac9d65ba6':
  Use structured format for verity metadata