Moreover these line causes the same Wshadow warning
which was the reason of adding them.

Change-Id: I6b5793b66db26720626b7924d59e9283168f8abe