Comment out unused parameters.

BUG: 18205090
Change-Id: I3b4e5961d8cca96c1ca131bc51233f473c980e67
Merge "Comment out unused parameters."