Take care of javadoc warnings from internal classes

Change-Id: Iffb65ae0e0bdb7ec8d7fbfac8d2966901357ef16