Fix for shadowed variable warning

Change-Id: I0237c5ef2db2abec697327638d389576931adc3e
Merge topic 'fix_compiler_warning' into master

3c54b355 Fix for shadowed variable warning