Clean up unused parameter warnings.

Change-Id: Ifbf310a0c10bd6afc3099bcad1026990bd1e6a22
Merge "Clean up unused parameter warnings."