Removed redundant, floating JavaDoc

Change-Id: Ic77fc2855efcc34b9b4888e769e1e088b4982f8c
Removed unused imports

Change-Id: If4342394f117be2b6d5d3567e4d22c8d046f83dc
Removed redundant, floating JavaDoc

Change-Id: I3b4b36d2ebba8db78c3b1c11a3da83ca730f222e
Synchronized the APIs with the changes introduced in commit 5baedfeec823813395bffdaf14dbd0c4fc19f395

Change-Id: I2e3b403b2d70f216314c64efaa99503095551120