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

Change-Id: If94e803f747e160a406bb3a80b583bc8c8d4af87