Merge "Fix unused-parameter warnings" am: f7f08afc8b am: d276716104 am: 8f9439a358
am: c7e4f8e44f  -s ours

Change-Id: Ic879fa6cb16caf7b5a3e1d5fa8fb4ddd3cff3e38