issue: #440936 make 'for_next' branch c++ compatible - step #5

Change-Id: I12fb18b57a070f6458594f31534c67cc2ead6ab8