Remove unused parameters

Change-Id: I89baba5fc281cb002ea8df0cd36f3960ab3a6b03
Merge "Remove unused parameters"