Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
a few changes to javadocs Change-Id: I2d671aafe91e4c6e224e2a556a60dce9f93f11ae