Merge "Fix that the update to v1 signed version fails if apk verity is enabled"