Merge "Fix up verify args logic from cl/232321132"