More javadoc

Change-Id: If201acfa8a376b6691640e499f2ed82a7eb22185