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

Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
2 files changed