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

Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp

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