WaE: -Wshadow

Change-Id: I3a9e01237d8cade5d99955f02c01c25618ccd9de