Merge "Fix unused-parameter warnings"
am: f7f08afc8b

Change-Id: I9edd4a3f3dc7b68730e15fc38ed05218150869c5