Fix constructor parameters shadowing member variables
am: 382ecd3d63

Change-Id: I89fc7c1780eab42ab17e028997db2d125f59c2d8