Merge "Clarify javadocs for getBody() and getBodyContentType()."