Fix for translation early exit

Also check for Verified -2. This change got lost by accident in the
previous patch I1ca73a03c67b34878244a3ebd926eb9bd60845f7 going
from patch set 7 to 8.

Change-Id: I9193c7ab0e0d79e26d209a0a8c03ef7cde91d962
Merge "Fix for translation early exit"