Fix up compiler warning of shadowed variables

Change-Id: I03a73612d7e27f3f0da7331cacd6228e3328f998
Merge topic 'compiler_warning' into master

66f9ae99 Fix up compiler warning of shadowed variables