Fix constructor parameters shadowing member variables am: 382ecd3d63
am: 6c79fc7bec

Change-Id: I5bf56d1691c20cd7830f309e88f13064837c7ccf