Sonar: Local variables should not shadow class fields

Shadowing fields with a local variable is a bad practice that reduces
code readability: it makes it confusing to know whether the field or the
variable is being used.

Inline the offending variable instead of rename it.

Change-Id: Ia708d5230babc31f7f0f16227df487552bafc1b5