Also update some javadoc comments. Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842
42fec57f
d9968438