Merge "Fix for-loop type."