Merge "Let update_verifier work on non-AB update devices"