Merge "Fix annotations javadoc build" am: eac7f6c477
am: 93c6e232cd

* commit '93c6e232cd3e11e31d440afdf26bc7dd949cbdab':
  Fix annotations javadoc build