Remove unneeded parameters

Test: cts-verifier
Change-Id: Ifaddd71aa44898c7c16f28f1715fd035861e3be6
7 files changed