Fixed compiler warning about shadow declaration of variable

Change-Id: I8a17792958f726e3a2b46ba88728dfd6339f236b
Merge topic 'fix_shadow_decl_warning' into master

a443bea2 Fixed compiler warning about shadow declaration of variable