Merge "Fix problems with veridex packaging"
am: a93364cbd4

Change-Id: I1a77ad7f2f1e65de17cff39e2e88a02a027bf915