[V1S1 US19] Update javadoc and logging