Correct variable names in @param to match method declarations

Some @param have a typo in the variable name,
some @param's were in wrong order.

Change-Id: Ie25806831027112b398f6f4a909c59147ac3a5fa
Merge "Correct variable names in @param to match method declarations"