am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verity metadata"

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