Merge commit '70cdb4d684e2821b614562fdb868140154db0026' * commit '70cdb4d684e2821b614562fdb868140154db0026': fix a javadoc build breakage
Merge commit '70cdb4d684e2821b614562fdb868140154db0026' * commit '70cdb4d684e2821b614562fdb868140154db0026': fix a javadoc build breakage