Merge "Change some mixed @param docs in api classes"