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

Change-Id: I794d0566ff2675238689f0809b14f4b262ce8cfa