Merge "Revert^2 "ART: Remove workaround in verifer after Jack update."" am: 3c683150 am: 251675c1 am: 8aeee7db Change-Id: Ie669efb94e1b022f5090d4e596307c5b35edf44b