Clean up unused parameter warnings.

Manual application of change 692018430f115343e36b0680acc659f2a731a5d7.

Change-Id: I100f838d70e591a13abb198dc420000ef114a429
(cherry picked from commit 97a3367a1b49b1761e3485765b2bd3f2293f9638)
2 files changed