Merge "Disable verity metadata for eng builds"