Hygiene: Cleanup mismatched function parameters warning

Change-Id: I1ffc309845c02d0c4f03207d34c78bbbd4d18bff
Merge "Hygiene: Cleanup mismatched function parameters warning"