Fixed a few shadowed variable and unused variable warnings

Change-Id: I84e729c653e0c16c7303d735a5d5b692ecd1535b
Merge topic 'fix_some_warnings' into next

6185dd45 Fixed a few shadowed variable and unused variable warnings