am 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break.

* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
  DO NOT MERGE - Fix Javadoc build break.