Fixed warnings with shadowed variables.

Change-Id: I610e68c34134a589d25771a32fae55fdf0cc6b06
Merge topic 'fix_chart_panels' into next

e39efad4 Fixed warnings with shadowed variables.