Fixed more unused variable warnings.

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

0a020e8b Fixed more unused variable warnings.