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

Merge commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342' into gingerbread-plus-aosp

* commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342':
  DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.