am 5a2c6a21: (-s ours) am 6f71894b: am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break.

* commit '5a2c6a2110e3ad26336158bd6679eba4292009e6':
  DO NOT MERGE - Fix Javadoc build break.