Merge "Fix unused-parameter warning"
am: a2a7195e23

Change-Id: I5f7f0a85d52e1a7a7cdf53cd6f8cc892a79cc1ca