Merge "Fix 562-checker-no-intermediate for HAdd."