am 635d492d: (-s ours) am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) * commit '635d492d':