Renamed local variable to fix redeclaration warnings

Change-Id: Icfc55559aa23daf9ddc999e6a44a6733dfc4114a
Merge topic 'fix_redeclaration_warning' into master

1942e91d Renamed local variable to fix redeclaration warnings