Fix constructor parameters shadowing member variables
am: 859dcdc983

Change-Id: I89d1d52301f31315df02f47abf826015dad58627