am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)

* commit '4bcc910817c694c8d8b20e39a5ff42c584af1d49':