This reverts commit 000280bb. Reason for revert: broke art veridex build Change-Id: I9f7d7cdbe8e34671614687ac0b34c0338ef240e7