am 77881293: DO NOT MERGE - Back port change from master that enforces...
am 77881293: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '77881293' into gingerbread-plus-aosp
* commit '77881293':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.