Also update some javadoc comments. Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842
907bcd96
644ebc88
0a7936b7