am 7844edfb: am 1b485808: Merge "Clarify javadocs for getBody() and getBodyContentType()."

* commit '7844edfb8ace346421c11e6834d8a12e8cbd9329':