am 18551815: (-s ours) am 77881293: DO NOT MERGE - Back port change from...
am 18551815: (-s ours) am 77881293: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '18551815'
* commit '18551815':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.