Merge "Merge "Fix that the update to v1 signed version fails if apk verity is enabled" am: 0b3fe647 am: b6fd88c4 am: 6f113ece"