Merge "Clean up two wifi javadoc comments"