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

Change-Id: Iba2e7dfbbb30cdb7d95badee8ff42ee6c355bfa2