DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.

Change-Id: I42956ccb3a32b3bd7c573bb2175e4ec230613dbf
1 file changed