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

Change-Id: Iaf80875375068f17fe12f8846fae8c5afc2cbc2f