Javadoc must be the same as the annotations of the methods. Change-Id: I895453e4eb92676e0af4afa8aa2bbf141c2fa7b3