Get rid of javadoc warnings

Change-Id: Ife025fabedbfd2925b8fa8af7c750ba81705dc70