Fixed warnings with shadowed variables.

Change-Id: I20281b1a3968db365404c6b4d56372236548ae11
Merge topic 'fix_extract_thresholds_for_table' into master

ef663ee2 Fixed warnings with shadowed variables.