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

Change-Id: If43c23abdd7448610be9cd6aacd5b79e3a49c0a6