[automerger skipped] ART: Refactor verifier
am: 2713d352f5 -s ours
am skip reason: change_id I79de01139b8fbd8b4e828bb0e58faeb8666176d5 with SHA1 fc25ae90c7 is in history

Change-Id: I603d3b0e859bcb31d64b9d2c982f6c51a1f41e62