Merge "Do not require fs-verity built-in signature"