Fix shadowed variable warning.

Change-Id: I9bea1c5d76edc4635ea7f8cffadb441bb10d9126
Merge topic 'silence-warning' into master

eff2e37f Fix shadowed variable warning.