Fix constructor parameters shadowing member variables am: 382ecd3d63 am: 6c79fc7bec am: 177b452c8c
am: 3dee7b766a

Change-Id: I0e557029e344ace9c92dd998ae8482b6f7714402