Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""